Skip to content

Conversation

@na9da
Copy link
Contributor

@na9da na9da commented Dec 5, 2024

Fixes TerriaJS/terriajs#6998
Merge after TerriaJS/terriajs#7351

@pjonsson
Copy link
Contributor

pjonsson commented Dec 5, 2024

I looked through this and besides the things I commented on, the things that are there looks good to me. Would love to get webpack 5 merged soon so Trivy can stop shouting about critical security vulnerabilities.

@na9da na9da mentioned this pull request Dec 8, 2024
7 tasks
@na9da na9da marked this pull request as ready for review February 11, 2025 04:20
@na9da na9da mentioned this pull request Feb 11, 2025
@ljowen ljowen self-requested a review February 11, 2025 05:54
@na9da
Copy link
Contributor Author

na9da commented Feb 11, 2025

Thanks @pjonsson those were good finds, I have fixed them.

Copy link
Contributor

@ljowen ljowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Do we also need to bump the version in Dockerfile?

@ljowen
Copy link
Contributor

ljowen commented Feb 11, 2025

  • Looks good! Beside docker comment, just need to add a CHANGES.md line :)

@pjonsson
Copy link
Contributor

  • Do we also need to bump the version in Dockerfile?

@ljowen good catch, and there's a second Dockerfile under deploy/docker. And speaking of simple things that get stuck for a long time in the PR queue, #691 fixes a warning in the Dockerfile.

@pjonsson
Copy link
Contributor

@na9da does #720 need to be merged before this?

package.json Outdated
"svg-sprite-loader": "^6.0.11",
"terriajs": "8.7.11",
"terriajs-cesium": "8.0.1",
"terriajs": "terriajs/terriajs#webpack5",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • replace now webpack5 is merged

@pjonsson pjonsson mentioned this pull request Feb 15, 2025
@na9da na9da merged commit 3a4a76e into main Feb 18, 2025
6 checks passed
@na9da na9da deleted the webpack5 branch February 18, 2025 23:09
@pjonsson
Copy link
Contributor

@na9da #726 passed the CI before this change (but after the ESLint update), but I just rebased it and it now fails:

ERROR in ./node_modules/terriajs/test/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroupSpec.ts:6:23
TS2307: Cannot find module 'fetch-mock' or its corresponding type declarations.
    4 | import OpenDataSoftCatalogItem from "../../../../lib/Models/Catalog/CatalogItems/OpenDataSoftCatalogItem";
    5 | import Terria from "../../../../lib/Models/Terria";
  > 6 | import fetchMock from "fetch-mock";
      |                       ^^^^^^^^^^^^
    7 |
    8 | import facets from "../../../../wwwroot/test/ods/facets.json";
    9 | import datasets from "../../../../wwwroot/test/ods/datasets.json";

The difference is from commit 28aa111 to commit 10c2192.

@import "~terriajs-variables";
@import "~terriajs/lib/Sass/global/global";
@use "../Styles/variables.scss";
@use "~terriajs/lib/Sass/global/global";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@na9da The 0.3.0 release notes state the ~terriajs alias was replaced with relative paths. Is it the release note or this usage that is wrong?

There is also a usage of ~terriajs left in terriajs (TerriaJS/terriajs#7427).

Copy link
Contributor Author

@na9da na9da Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good spot. I think I got the release notes wrong. It should be ~terriajs-mixins instead.

~terriajs imports style sheets from dependencies in node_modules. Use of tilde for imports is deprecated by sass-loader but still works. I'll remove them in the next release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upgrade to webpack 5

5 participants